From 0082626f35af6cfcdd30214d946981a8aec82c08 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 6 Jan 2015 16:18:42 +0000 Subject: [PATCH] Open Xen 4.6. * Update README's figlet. * Remove obsolete 4.3 features paragraph from README (!) * Update QEMU_UPSTREAM_REVISION to refer simply to `master' * Update QEMU_TRADITIONAL_REVISION to refer to the actual commit hash. * Change version in xen/Makefile to 4.6.0-unstable Signed-off-by: Ian Jackson --- Config.mk | 4 ++-- README | 22 ++++++---------------- xen/Makefile | 4 ++-- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/Config.mk b/Config.mk index 0e22057e1c..632423757c 100644 --- a/Config.mk +++ b/Config.mk @@ -252,7 +252,7 @@ QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-unstable.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.0-rc4 +QEMU_UPSTREAM_REVISION ?= master SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 # Thu May 22 16:59:16 2014 -0400 # python3 fixes for vgabios and csm builds. @@ -260,7 +260,7 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= xen-4.5.0-rc1 +QEMU_TRADITIONAL_REVISION ?= b0d42741f8e9a00854c3b3faca1da84bfc69bf22 # Mon Oct 6 16:24:46 2014 +0100 # qemu-xen-trad: Switch to $(LIBEXEC_BIN) from $(LIBEXEC) diff --git a/README b/README index 412607aa84..07c4797c74 100644 --- a/README +++ b/README @@ -1,10 +1,10 @@ ################################# -__ __ _ _ ____ _ _ _ -\ \/ /___ _ __ | || | | ___| _ _ _ __ ___| |_ __ _| |__ | | ___ - \ // _ \ '_ \ | || |_ |___ \ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \ - / \ __/ | | | |__ _| ___) |_____| |_| | | | \__ \ || (_| | |_) | | __/ -/_/\_\___|_| |_| |_|(_)____/ \__,_|_| |_|___/\__\__,_|_.__/|_|\___| - +__ __ _ _ __ _ _ _ +\ \/ /___ _ __ | || | / /_ _ _ _ __ ___| |_ __ _| |__ | | ___ + \ // _ \ '_ \ | || |_| '_ \ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \ + / \ __/ | | | |__ _| (_) |_____| |_| | | | \__ \ || (_| | |_) | | __/ +/_/\_\___|_| |_| |_|(_)___/ \__,_|_| |_|___/\__\__,_|_.__/|_|\___| + ################################# http://www.xen.org/ @@ -19,16 +19,6 @@ is freely-distributable Open Source software, released under the GNU GPL. Since its initial public release, Xen has grown a large development community, spearheaded by xen.org (http://www.xen.org). -The 4.3 release offers a number of improvements, including NUMA -scheduling affinity, openvswitch integration, and defaulting to -qemu-xen rather than qemu-traditional for non-stubdom guests. -(qemu-xen is kept very close to the upstream project.) We also have a -number of updates to vTPM, and improvements to XSM and Flask to allow -greater disaggregation. Additionally, 4.3 contains a basic version of -Xen for the new ARM server architecture, both 32- and 64-bit. And as -always, there are a number of performance, stability, and security -improvements under-the hood. - This file contains some quick-start instructions to install Xen on your system. For more information see http:/www.xen.org/ and http://wiki.xen.org/ diff --git a/xen/Makefile b/xen/Makefile index 72c13136a3..52643e8128 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -1,8 +1,8 @@ # This is the correct place to edit the build version. # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 -export XEN_SUBVERSION = 5 -export XEN_EXTRAVERSION ?= .0-rc$(XEN_VENDORVERSION) +export XEN_SUBVERSION = 6 +export XEN_EXTRAVERSION ?= .0-unstable$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- 2.30.2